Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 12 Jul 2011 17:46:56 +0000 (10:46 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 12 Jul 2011 17:46:56 +0000 (10:46 -0700)
commit507d8a64f178e549bddf7fa656ad0d6225ec7567
tree28aad36d3c6c630674bad1e46101e6255d6618f5
parent1138e66d64417e8868ebb61d53f4cca8d9af2c70
parent9fb72a5bf8347bd1b940369d6775de5eccf4dbc3
Merge from trunk.